Disable unredirection when a modal operation is active

When the shell takes control of the screen (for example to show
a modal dialog or to lock the screen), it must reestablish itself
on top of the stack, and in particular restore any unredirected
window so that it is composited below the Shell UI.

Reviewed-By: drago01 in IRC.

diff --git a/js/ui/main.js b/js/ui/main.js
index 4248ab9cd151b85ce61fa438b3b3dc99c2c3e04d..bc5a3df30c5e159f85368193e49ab7e7f78f330f 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -671,6 +671,7 @@ function pushModal(actor, timestamp, options) {
             log('pushModal: invocation of begin_modal failed');
             return false;
         }
+        Meta.disable_unredirect_for_screen(global.screen);
     }
 
     global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
@@ -751,6 +752,7 @@ function popModal(actor, timestamp) {
 
     global.end_modal(timestamp);
     global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
+    Meta.enable_unredirect_for_screen(global.screen);
 }
 
 function createLookingGlass() {